Fuel line connections at engine bay [Mk4 GTI]

Hey guys, first post here - bit of a VW noob, so sorry if my question is a bit silly. I tried searching first!

Basically, I'm wondering if anyone could fill me in on which fuel line goes to which connector at the engine bay of a Mk4 GTI 1.8t.

After having my timing belt and water pump done, I started getting a in intermittent leak at the fuel filler cap (and a 'whoosh' noise when the cap is open.

I checked the fuel pump etc and it all seems fine, so I went and did some more research online.

I found a couple of threads on some forums where people said their fuel supply/return lines had been mixed up, causing similar problems.

The posts I read said the fuel lines should match up to the corresponding clip colour on the connections (black, blue & white).

So, I checked the engine bay earlier and noticed the white line had the blue-clip connector on it, and the blue hose had the white-clip connector on it.

This is what they looked like:

I swapped them over, so the white line now has the white-clip connector on it, and the blue line has the blue-clip connector on it.

This is what they look like now:

I'm a bit concerned that I should have left them how they were, and I can't seem to find any concrete info to suggest if I was right or wrong.

Anyone have advice for me?

Cheers,
Oliver